Repository navigation
chore: merge upstream main into fork - #124
Merged
Merged
Conversation
pingdotgg#31816) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#37032) Co-authored-by: Taylor Dolezal <117500+onlydole@users.noreply.github.com>
…d snoozed threads (pingdotgg#31894) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#31885) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…e sequences (pingdotgg#31882) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ntry" and "1 cell" (pingdotgg#31886) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…pingdotgg#31929) Co-authored-by: Geezy <igor.licko@gloryck.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#32089) Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: marcel <marcel@marcels-MacBook-Air.local> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…32177) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ssions (pingdotgg#31870) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…31906) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…loss (pingdotgg#32169) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dvertised as LAN routes (pingdotgg#32140) Co-authored-by: repparw <repparw@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gg#32183) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#32188) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…res (pingdotgg#32122) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…URL (pingdotgg#29625) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ards (pingdotgg#30695) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Jerry Wu <haoyuwu@andrew.cmu.edu> Co-authored-by: sisyphus-dev-ai <sisyphus-dev-ai@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…er (pingdotgg#33107) Co-authored-by: maria-rcks <maria@kuuro.net>
…t declined (pingdotgg#33575) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#29498) Co-authored-by: amr sarhan <amr@amrs-MacBook-Air.local> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…startup (pingdotgg#32053) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ff instead of left blank (pingdotgg#37240)
…nes (pingdotgg#37243) Co-authored-by: Grok 4.7 <noreply@x.ai> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…7233) Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ide a wake envelope (pingdotgg#37257)
…gdotgg#37271) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Grok 4.7 <noreply@x.ai> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Merge pingdotgg/t3code main through 21fe33c and resolve 202 conflicted files. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
|
The jobs were pinned to macos-26. The iOS store build needs Xcode 27.1, which that image may not carry, so the jobs follow the newest hosted image. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
…avior connectOverRoutes compared the fork's map of transient errors against undefined, so a route that stayed silent was never tried. Claude text generation now keeps launch-arg environment variables when an account directory also sets some. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
…provider cools down Upstream sends a new thread's first message inside thread.create, so the receipt the delegation guard looked for is never written. The guard now runs where new delegated work starts. Thread launch and group conversation tests wait on the events the merged code emits. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
… undid Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
A large merge puts over a thousand test files beside its changes, which one step cannot finish inside its 900 s limit. check:changed gains --skip-tests, and the fork job passes it because the shard jobs already run the suites. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This was referenced Nov 18, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why
The fork was 1,350 commits behind
pingdotgg/t3codemain. This merges upstream through21fe33c8d7and resolves all 202 conflicted files. Each conflict keeps the fork feature and takes the upstream fix; where both sides solved the same problem, upstream's version wins.What changed
macos-latest, the mobile native job calls its lint script directly, and the changed-file check passes the new--skip-testsflag because the shard jobs run the suites.Scope
Tradeoffs
send_to_userand theme tools, so this PR carries theagent-context-increaselabel.WorktreeBranchSyncand the fork'sWorktreeBranchesboth run. They converge on the same thread branch, but no test exercises them together.--skip-testsapplies to every fork pull request, not only large ones.Blast Radius
Every surface changes, because upstream touched about 2,400 files. The risk sits in the hand-merged server files: orchestration, provider adapters, storage cleanup and peer links. Existing installs run migrations 100–112 on their next start.
Verification
Merged with Claude Opus 5.5 and Claude Fable 5.2 in Claude Code; four test fixes delegated to Claude Opus 5.5 and GPT-6.1 Sol.
🤖 Generated with Claude Code